Reverted from 2.1.5 to 2.1.2 because it is suppoted by engineyard