Revert 53fbc56..b3f44b5

This rolls back to commit 53fbc563065df1bb514c94d429a4189ee05df13d.