Revert 2f62c0ceee7b2745276082b62c111fd57d3d174e

This commit is causing bug 976328. Reverting for now.

-----

@icaaq: Sorry to completely revert this. Just want to get live samples up and running for now. Feel free to submit a corrected PR any time.