Revert 0a8a9f0..2471d14

This rolls back to commit 0a8a9f07ec5c879e3a120e3b8c42efbfed785229.