Revert 6075ee1..9fb6bcc

This rolls back to commit 6075ee11e4d8b60cc33f816632e5e92724996c02.