Revert 06d59b7..bff523c

This rolls back to commit 06d59b7212b1d89254979009a6c5932777535a7f.