Revert fc2f537..d2f2cf7

This rolls back to commit fc2f537514d4da485bd1b5217c0e7273fdaa3b8f.