Revert 955ee4c..ca2a470

This rolls back to commit 955ee4c5a8d8331b1c3bf122d9fe83bc41394654.