Revert e219c4c..6b16a38

This rolls back to commit e219c4ccdf7ad54d00ce785e732a1fb9cc046ff4.