Revert 5a77779..c742d3f

This rolls back to commit 5a77779b6cb02a42de0a9201ae48928d8ba37128.