Revert a40fec7..54fbaa8

This rolls back to commit a40fec7144564fe600ac7785ef94445cd8c16c49.