Revert 9ab01eb..e6c3b68

This rolls back to commit 9ab01eb696d4acb3237a2d083beef4b91f786cea.