Revert 65faaa1..a30568f

This rolls back to commit 65faaa1ac793cc3e9901862993535c4a517ecebf.