Revert 1050fd4..1a79da2

This rolls back to commit 1050fd4b49b45011a8a97dcc4d8b9521f8bba3f5.