Revert 2fe898c..b04f6b5

This rolls back to commit 2fe898cda8be79daaf8d6f2f3d1064baba5182ce.