Revert 49fbb75..bf17177

This rolls back to commit 49fbb7581ea943703d499fc08d8f49508c41f18f.