Revert 5f42a78..06b7d2c

This rolls back to commit 5f42a787c114d23744e1496eda275312c76703cb.