This reverts commit 9925ce6005. This commit is being reverted since it does not apply to BlissROM.
9925ce6005