Revert 31c0770..5d54a5b

This rolls back to commit 31c07707aedb284380a946c3419f2b9d34e06aea.