Revert 58df1aa..7bbf57d

This rolls back to commit 58df1aa13dde2029216c5c6201984ce88d090501.