You should do it properly...something might break, warned Ben. This reverts commit 18b8642647.
18b8642647