Revert a330106..757d3d5

This rolls back to commit a330106376fff7abb49af38d8577e8cdda946994.