Revert 663c5cc..ed73421

This rolls back to commit 663c5cc887633a3ebf925b987109d9b064c7b0ce.