Revert 5f58402..fd327f8

This rolls back to commit 5f584026cd780b10cc74cbd4a1a111339afae0a6.