Revert 5536c53..f2f379d

This rolls back to commit 5536c53cb3e3c0fe07a84b531e4cab3a21555a83.