Revert 55ec5e1..a47945a

This rolls back to commit 55ec5e192bc06abd75023fe40086f9e8b9774356.