Revert 23efae2..f8a5aa5

This rolls back to commit 23efae21086c150acfb416bb51412cebb54c9abf.