Revert 1d91ada..6b39902

This rolls back to commit 1d91ada9a604275a939e1e430c843a4d2de28e7b.