Revert 5b1d01b..8558ae7

This rolls back to commit 5b1d01b073992c6944e34679fff8735c3335b738.