Revert 003cee2..f0c4154

This rolls back to commit 003cee2b530779f5082b2f81e6307d5982983eaf.