Revert 4fc3346..e331eb7

This rolls back to commit 4fc334640df257098b9d486260d13f9b677f5443.