Revert 7496f92..458af78

This rolls back to commit 7496f9226d55f7282b9a7938f22f0bb5d81caa81.