Revert "Prepare for revert :P"

This reverts commit 1a4969bda8e0d16a32ddb13acd6b9e65040a509b.