Revert 1c9f81f..6247413

This rolls back to commit 1c9f81f5b565da2eabdaf2cc4ab50e06447ad559.