Revert f622064..a893e42

This rolls back to commit f622064bb2a93d5091dc3d7c4e73a5872eb800da.