Back out changes accidentally copied over...

...from develop branch