Revert 4c6c12c..68b300b

This rolls back to commit 4c6c12c5029c9b8733ef8cb3f17ea5e637f9b9bc.