Revert 433cf38..26e861e

This rolls back to commit 433cf38c4d0ee7efe5f31cda635204b3c0e41ecd.