Revert 04bcd0d..a5c9ea5

This rolls back to commit 04bcd0dcca32584b946719aa940ac024b91c2dbb.