Revert f4f670e..f658500

This rolls back to commit f4f670ebc6bb08246ec7449a158ee85b248c5ea7.