Revert 5b12b9f..b54b891

This rolls back to commit 5b12b9f1868d4954cb970d837584dec8356a8f20.