Revert f19341c..ea68ca2

This rolls back to commit f19341cca7ad5a6fa23baf3a93f69cf21a7e75a7.