Attempt at Rails 3.2 Compatibility