Revert 95f4fee..1342702

This rolls back to commit 95f4feef3d3e0311177eb9fbe383b17c20c73f9c.