Revert fa6f523..9513e69

This rolls back to commit fa6f523c3581cba20bc48178965124aaeb55e1e9.