Revert 3945db5..b439947

This rolls back to commit 3945db5651ad0e56d975f021ee0d9e7001d90bd1.