Revert af30e4b..0a53073

This rolls back to commit af30e4b74c8456d723eddf4a74414463a9c6f67c.