Revert d47988b..e5d340f

This rolls back to commit d47988b242ec671e3b60d6a4f4c0f0c15aedee08.