Revert b2f20c6..54b1122

This rolls back to commit b2f20c6c909826a37efb5c7a24776f919b51a3c7.