Revert d6dcf63..3ee8544

This rolls back to commit d6dcf6326bee0937e4e6d1a0259d64724aaf29bd.