Revert 6ec86aa..29bd179

This rolls back to commit 6ec86aa43b92eab460dfec6a7e699e1415b705b7.