Revert b5b8d65..8593707

This rolls back to commit b5b8d6543d8d6e860a56d4217dd12cc06c32628a.