Revert 3bac9ef..a9cc8f2

This rolls back to commit 3bac9ef6c0e3c1044e9d6a390879a5142268517a.