Revert cab4ee2..9b56fbe

This rolls back to commit cab4ee285053c0b39207c5dee43f5920d3d46796.