Revert 68ab7f6..f03e0a0

This rolls back to commit 68ab7f62fbb247afbcc7336293ed999e6a31323b.