Revert 83fe3bb..3cc1acf

This rolls back to commit 83fe3bba8cf2ca6a5a67a885f7b42128a5a53573.