Revert 99b7c80..2abf3f0

This rolls back to commit 99b7c800c203d622d67c1d23315542902dc6252d.