Revert 5783b05..123ddaa

This rolls back to commit 5783b05e1bcb0910805a6f96b5e047b23479a77b.