Revert d6c7a5e..24055fa

This rolls back to commit d6c7a5e57a7a7ab26f916787d637a167283988a7.