Revert "Merge pull request #220 from Cerberus98/rm9305"

This reverts commit aedc860f9bef544328fa19fcb70e71c8f5183dbb, reversing
changes made to e7a9f77e1a2e1b67e0cffb478570d8cee79812a1.