Revert f4e7e60..39c78a2

This rolls back to commit f4e7e60eede473c8d66b72ab643cc46004b3cd17.