Revert dc33126..c54c3b5

This rolls back to commit dc331263b922b1a863b352d3504582c2cc250fbc.