Revert 73c54c2..215cf8a

This rolls back to commit 73c54c2715d6f091ed73a80076a1369be5a874ed.