Revert b5d5245..62a6f10

This rolls back to commit b5d52454d9de2e691d42f4d37266a9e8e9df37e2.