Revert a2320a0..523c45f

This rolls back to commit a2320a079b53c9f094ae4c511555f26d20a9d1a3.