Revert d1f7ecb..5d31492

This rolls back to commit d1f7ecbc07dbf4b7b8808fbf1bd91157598f1a6b.