Revert a69010c..cc72fe5

This rolls back to commit a69010ca944390e1a024251c51a7fd1d622b4f31.