Revert 6312cdf..aba3ab9

This rolls back to commit 6312cdf0c01f5fc9b96d1815d4c0c3ac6f933b72.