This reverts commit a42cb0e3ab. Testing hypothesis that this was causing Staging to break.
a42cb0e3ab