Remove some weird code that was messing things up with the get_buffer
utility