Revert a8d7d3b..62ae2ed

This rolls back to commit a8d7d3be7cb50e983b5b2903d588ef90170a0fc0.