Revert 9bc9806..91d22b8

This rolls back to commit 9bc9806232bb7062315a7eeca272e1c50667082b.