Revert b4af579..62d9c44

This rolls back to commit b4af5797c4b1eaa7a59fdec4617bc92a27e8ccda.