Revert 882dc3b..2ae9cbd

This rolls back to commit 882dc3bf05532a3f2abeccde9006d8e5503b3db8.