Revert fefa91c..3436272

This rolls back to commit fefa91ce42229b3c22a8bd3e39296c05d62ae56e.