Revert cc47686..0df2d6c

This rolls back to commit cc47686d0cb4533257b6f27b6d5675ac053906ef.