Revert 2c1ee5f..1620020

This rolls back to commit 2c1ee5fcf03cfa51378eab222861a941150205df.