Revert 2d1a74b..42131a4

This rolls back to commit 2d1a74b25a4c293771c12b54e1ea50f9951e8117.