Revert 6285db1..ea0042c

This rolls back to commit 6285db16df69e39425a1ebff7899d258a0d6085c.