Revert 005278d..ed00777

This rolls back to commit 005278d67400381edcb3b3334262d21fba5896c7.