Revert adb060d..0bdd35e

This rolls back to commit adb060d139ef0d1573b0d9e859a05811ea7c711c.