Revert a153b61..cd739ec

This rolls back to commit a153b615a185591f9ec217dff71ff8d4dc59f459.