Revert 5590e41..50857e5

This rolls back to commit 5590e41f401e8891c08ade89121e79dfcfc4c62a.