Revert dc33126..cca3825

This rolls back to commit dc331263b922b1a863b352d3504582c2cc250fbc.