Revert 81102ff..0e8474e

This rolls back to commit 81102ff9286456b9a8b2d42a3a9cd797654503c8.