Revert 8548321..e3bbff2

This rolls back to commit 85483219a5991a1f5235a6878c80bd6539ef8e5a.