Revert 683f2be..48b4f38

This rolls back to commit 683f2be3a4492abd902a39d21678004e22d0154b.