Revert 003775e..35c7cba

This rolls back to commit 003775edfbb0bd0e1233166002a9ab16c1c20816.
Revert adapters messup