Revert 7080346..2b64c52

This rolls back to commit 708034646b92c26c1b2f6bfd12b91736974814fc.