Revert 0baa6b2..6a2edc0

This rolls back to commit 0baa6b2dde43f3a600b5395b77e4ecc33df2d886.