Revert 00adb22..5dcd591

This rolls back to commit 00adb22d1c95f6669c1508fbb9d69ad346cd55ce.