Revert bf72f51..48a6d6b

This rolls back to commit bf72f51ca912ce2c97a0dce03fbf4709570b4e33.