Revert 98c7fb5..cdcb4ac

This rolls back to commit 98c7fb534cac33066e375ad1b9196ebab871e4f7.