Revert e4b1b52..fc774d3

This rolls back to commit e4b1b5210342984de29039333628ad2b0e412a00.
take 6