Revert c911d8b..0f90bc9

This rolls back to commit c911d8b6bca6ba12ae1e8d16f358f18703fd2bad.