Revert aeed579..f9ba92c

This rolls back to commit aeed579334f234aa76fefaee612984930eab14bd.
Clean up