Revert 3ca1ad1..b4ef881

This rolls back to commit 3ca1ad10acd7be55e46a2ce1b11d523500af814b.