Revert "merge conflict"

This reverts commit f0f8adc8c3cfae22fcc6581fbf171ab0ad194491, reversing
changes made to dd8ff75b1b455157e30aadc9521cb253fb9119f6.
Revert f0f8adc..c99bbb3

This rolls back to commit f0f8adc8c3cfae22fcc6581fbf171ab0ad194491.