Revert "Squash in the latest from Nameless ROM"

This reverts commit 0750e2cb356aaefbe1fbd994d3e8591d0255a075.