Revert 20b96c7..06b460b

This rolls back to commit 20b96c7d51618a9e4e173e7b02bceff439bd1488.