Revert f86cd13..9c3e8f4

This rolls back to commit f86cd132e66040420306c07494bdffad454cb5af.