Revert 724d8d8..0625eab

This rolls back to commit 724d8d82c3c88f6d1236b6b911816c92d2bb907d.