Revert ffff9ad..85781ee

This rolls back to commit ffff9adac9d3c1b4b54c9615f91bc2af6de38d86.
Revert fe1d292..3b2d64b

This rolls back to commit fe1d29223c6dcf10f14792c1e3946125b38eb54e.