Revert 0654cea..dc080b5

This rolls back to commit 0654ceaee6d4ff598e23f4f6c0c9d9ec3220d62d.