Revert 053559b..07938a7

This rolls back to commit 053559bcb95fa0a8f7dc7a80d8e8ff96650adb58.