Revert 4bb9569..472b311

This rolls back to commit 4bb95691685f1c2a7a6f2e54bc7eedabec9f6816.