Revert 55ca452..7080934

This rolls back to commit 55ca452818ba858e7da5519053632b575f0382b4.