Revert 5461821..41fd52b

This rolls back to commit 5461821df267cd1d8f6c62b3446eb9d5d55ea9f3.