diff --git a/src/mame/drivers/tatsumi.cpp b/src/mame/drivers/tatsumi.cpp
index 52132dc7e9f..e11190ef44a 100644
--- a/src/mame/drivers/tatsumi.cpp
+++ b/src/mame/drivers/tatsumi.cpp
@@ -272,7 +272,7 @@ void apache3_state::apache3_v20_map(address_map &map)
 	map(0x00000, 0x01fff).ram();
 	map(0x04000, 0x04003).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write));
 	map(0x06000, 0x06001).portr("IN0"); // esw
-	map(0x08000, 0x08001).r(FUNC(apache3_state::tatsumi_hack_ym2151_r)).w(m_ym2151, FUNC(ym2151_device::write));
+	map(0x08000, 0x08001).rw(m_ym2151, FUNC(ym2151_device::read), FUNC(ym2151_device::write));
 	map(0x0a000, 0x0a000).r(m_oki, FUNC(okim6295_device::read)).w(m_oki, FUNC(okim6295_device::write));
 	map(0x0e000, 0x0e007).rw("adc", FUNC(adc0808_device::data_r), FUNC(adc0808_device::address_offset_start_w));
 	map(0xf0000, 0xfffff).rom().region("sound_rom", 0);
@@ -320,7 +320,7 @@ void roundup5_state::roundup5_z80_map(address_map &map)
 {
 	map(0x0000, 0xdfff).rom();
 	map(0xe000, 0xffef).ram();
-	map(0xfff0, 0xfff1).r(FUNC(roundup5_state::tatsumi_hack_ym2151_r)).w(m_ym2151, FUNC(ym2151_device::write));
+	map(0xfff0, 0xfff1).rw(m_ym2151, FUNC(ym2151_device::read), FUNC(ym2151_device::write));
 	map(0xfff4, 0xfff4).r(m_oki, FUNC(okim6295_device::read)).w(m_oki, FUNC(okim6295_device::write));
 	map(0xfff8, 0xfffb).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write));
 	map(0xfffc, 0xfffc).portr("STICKX");
@@ -379,7 +379,7 @@ void cyclwarr_state::sound_map(address_map &map)
 {
 	map(0x0000, 0xdfff).rom();
 	map(0xe000, 0xffef).ram();
-	map(0xfff0, 0xfff1).r(FUNC(cyclwarr_state::tatsumi_hack_ym2151_r)).w(m_ym2151, FUNC(ym2151_device::write));
+	map(0xfff0, 0xfff1).rw(m_ym2151, FUNC(ym2151_device::read), FUNC(ym2151_device::write));
 	map(0xfff4, 0xfff4).r(FUNC(cyclwarr_state::oki_status_xor_r)).w(m_oki, FUNC(okim6295_device::write));
 	map(0xfffc, 0xfffc).r(m_soundlatch, FUNC(generic_latch_8_device::read));
 	map(0xfffe, 0xfffe).nopw();
diff --git a/src/mame/includes/tatsumi.h b/src/mame/includes/tatsumi.h
index 79f0f433c35..39971d2b0a7 100644
--- a/src/mame/includes/tatsumi.h
+++ b/src/mame/includes/tatsumi.h
@@ -66,8 +66,6 @@ protected:
 	uint16_t tatsumi_sprite_control_r(offs_t offset);
 	void tatsumi_sprite_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 
-	uint8_t tatsumi_hack_ym2151_r();
-
 	void tatsumi_reset();
 	template<class BitmapClass> void draw_sprites(BitmapClass &bitmap, const rectangle &cliprect, int write_priority_only, int rambank);
 	template<class BitmapClass> inline void roundupt_drawgfxzoomrotate( BitmapClass &dest_bmp, const rectangle &clip,
diff --git a/src/mame/machine/tatsumi.cpp b/src/mame/machine/tatsumi.cpp
index c358a5bbbfb..93922f9a614 100644
--- a/src/mame/machine/tatsumi.cpp
+++ b/src/mame/machine/tatsumi.cpp
@@ -303,19 +303,6 @@ void tatsumi_state::tatsumi_v30_68000_w(offs_t offset, uint16_t data, uint16_t m
 
 /***********************************************************************************/
 
-// Todo:  Current YM2151 doesn't seem to raise the busy flag quickly enough for the
-// self-test in Tatsumi games.  Needs fixed, but hack it here for now.
-uint8_t tatsumi_state::tatsumi_hack_ym2151_r()
-{
-	int r=m_ym2151->status_r();
-
-	if (m_audiocpu->pc()==0x2aca || m_audiocpu->pc()==0x29fe
-		|| m_audiocpu->pc()==0xf9721
-		|| m_audiocpu->pc()==0x1b96 || m_audiocpu->pc()==0x1c65) // BigFight
-		return 0x80;
-	return r;
-}
-
 uint8_t cyclwarr_state::oki_status_xor_r()
 {
 	int r = m_oki->read();