Revert 649c916..c2f8b3b

This rolls back to commit 649c9168f766713faa3983d567c6036f2d1e1665.