Revert 4bb08dd..54571fb

This rolls back to commit 4bb08dd89d4cfc2495b168d1a8fa3edfe00a0534.