Revert 9da8c5f..c9d04d4

This rolls back to commit 9da8c5f8c081d1afab3edbe9ac7cdfed5ed1b814.