Revert 6b3c5b0..14bf68e

This rolls back to commit 6b3c5b02f385c6625e6cc4453509f7160417473d.