Revert 129b801..fd35d00

This rolls back to commit 129b80163f19a1e2fefda11a35ba2f0ae494e15b.