Revert a876963..a1451c6

This rolls back to commit a8769636a23b2df5952c7f0824fdb5739bd5ca2b.