Revert f3eb075..fc0d2f3

This rolls back to commit f3eb0757e2885b53cad5c3faa8dc8973b0b3c6bb.