Revert 5d840d1..8f9a194

This rolls back to commit 5d840d14defb2b0d98e6cae6fcf3f7ce5a520df1.