Reverted back to previous change due to heroku crash